Hyper-const util.cc

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4247 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 38ad1c05328ceb17cb9c7d3918e0e755984423ef..2875e87b22d80f079155a7717870ffe98b7f51eb 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -878,7 +878,7 @@ char* strenquote(const char* str, const char quot_char);
 
 char* strsub(const char* s, const char* search, const char* replace);
 char* gstrsub(const char* s, const char* search, const char* replace);
-char* xstrrstr(const char* s1, const char* s2);
+const char* xstrrstr(const char* s1, const char* s2);
 void rtrim(char* s);
 char* lrtrim(char* s);
 int xasprintf(char** strp, const char* fmt, ...) PRINTFLIKE(2, 3);
@@ -902,7 +902,7 @@ char* convert_human_date_format(const char* human_datef);   /* "MM,YYYY,DD" -> "%m
 char* convert_human_time_format(const char* human_timef);      /* "HH+mm+ss"   -> "%H+%M+%S" */
 char* pretty_deg_format(double lat, double lon, char fmt, const char* sep, int html);    /* decimal ->  dd.dddd or dd mm.mmm or dd mm ss */
 
-char* get_filename(const char* fname);                         /* extract the filename portion */
+const char* get_filename(const char* fname);                   /* extract the filename portion */
 
 /*
  * Character encoding transformations.

diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc
index 65460b3ab1e908faf9430a413056f934fa65d533..0f10277deabc7eb9a3dc0ac3eae6d73332330c2a 100644 (file)
--- a/gpsbabel/util.cc
+++ b/gpsbabel/util.cc
@@ -1176,7 +1176,7 @@ double degrees2ddmm(double deg_val)
 char *
 strsub(const char *s, const char *search, const char *replace)
 {
-  char *p;
+  const char *p;
   int len = strlen(s);
   int slen = strlen(search);
   int rlen = strlen(replace);
@@ -1239,10 +1239,10 @@ gstrsub(const char *s, const char *search, const char *replace)
 /*
  * Like strstr, but starts from back of string.
  */
-char *
+const char *
 xstrrstr(const char *s1, const char *s2)
 {
-  char *r = NULL, *next = NULL;
+  const char *r = NULL, *next = NULL;
 
   while (next = strstr(s1, s2), NULL != next) {
     r = next;
@@ -1892,9 +1892,11 @@ char *xml_attribute(xml_tag *tag, const char *attrname)
   return result;
 }
 
-char *get_filename(const char *fname)
+const char *get_filename(const char *fname)
 {
-  char *res, *cb, *cs;
+  const char *res;
+  const char *cb;
+  const char *cs;
 
   cb = strrchr(fname, '\\');
   cs = strrchr(fname, '/');